From 21953764044f943d10bacce409ff4492d882d7cd Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Fri, 31 Jan 2014 16:35:47 +0000 Subject: [PATCH] libxl: Fix vcpu-set for PV guest. vcpu-set will try to use the HVM path (through QEMU) instead of the PV path (through xenstore) for a PV guest, if there is a QEMU running for this domain. This patch check which kind of guest is running before before doing any call. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell --- tools/libxl/libxl.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2845ca4969..c4fe6aff3d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4692,12 +4692,21 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); int rc; - switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + break; + default: + rc = ERROR_INVAL; + } break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + case LIBXL_DOMAIN_TYPE_PV: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); break; default: rc = ERROR_INVAL; -- 2.30.2